<!DOCTYPE html>
<html lang="en">
<head>
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>Document</title>
</head>
<body>
    <h1>主线</h1>
<<<<<<< HEAD
    <p>开始，第一次</p>
    <p>第二次</p>
=======
<<<<<<< HEAD
    <h5>这是yyy支线</h5>
=======
    <p>这是xxx支线</p>
>>>>>>> xxx
>>>>>>> yyy
</body>
</html>